Bug 584638 - Build of gtkupdateiconcache without NLS breaks

Wrap textdomain calls in updateiconcache.c in NLS conditionals.

diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index 02d004791165277d3eb23a78487788cafb9a5c79..3b927011cccccc142363f35df8883ab0b1966dd9 100644 (file)
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -1656,8 +1656,12 @@ main (int argc, char **argv)
   
   setlocale (LC_ALL, "");
 
+#ifdef ENABLE_NLS
   bindtextdomain (GETTEXT_PACKAGE, GTK_LOCALEDIR);
+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+#endif
+#endif
 
   context = g_option_context_new ("ICONPATH");
   g_option_context_add_main_entries (context, args, GETTEXT_PACKAGE);